Fix some mess detector warnings