Fix some silly issues
Blindly push code