Fix some mess