Fix some more code