#41 OSX fixes