Fixed javadoc failure and CS issues