nitpicks to fix build on OS X (i hope)