Fixed some harmless bugs.