Various fixups because java_home is a mac thing