Fixed compile and checkstyle errors