Adding a couple of checkstyle checks, fixing couple of warnings