Fix some more shit