Two small bugs.

Last commit for this branch!