Some work on getting checkstyle to work again