Make things work on OS X