Add some tweaks to make Java look and work better