Ugh. Fix bugs I forgot to notice last commit.

also, remind me never to use SmartGit again... kthanks appreciate it