Fix even more bugs.