Various nit-pickery necessary for OS/X