Added slightly better Mac OS X target support