squashed warnings and made it build on mavericks