Fix ugly looking stuff