Andy Chu Fix bugs from head

Latest commit 761f60c

Dec 6, 2009