Fix some more changes