Several foolish bugs caught by Eric Grosse

-Steve