Fixed checkstyle and lame compilation issues