more MacOSX mavericks fixes