Fix some boogs