Fix for mavericks
Small fixes