#30 Australis compatibility - buttons bugfixes