Fix some more error