Now it compiles and works again on Mavericks