Further OSx support and testing