Fix some more problems