Multiplatform issues fixed (on OSX)