Fixed some issues with java files