more fixes for MacOSX