Fixed more of the same bugs.