cs/java fixes