Further fixes/amendments for OS X 10.5 compatibility