Minor bug/cosmetic fixes.