Update to make more OS X compatible