Better 10.5 compatibility - not all the way there yet
More work on OSX Leopard compatibility