Fixed stuff for Java