RTE fixes for mac