Hopefully improve cross-platform compatibility (esp. OSX)