Fix some more bugs...