OSX fixups

Signed-off-by: Jeremy C. Andrus <jeremya@cs.columbia.edu>