Bugfix/java checks (#1228)