Some fix(es) I've come across for OS X