Fixed some more bugs.