Australis compatibility, bug fixes