Java compliance fixes...