Fix some more bugs.