Checkstyle and Messup fixes.