Add a few fixes to fix travis. Checkstyle fixes