Bug fixes, checkstyle errors fixed.