Fixed another few bugs.