Fix some unhandled cases and style problems