Bug fixes (post fresh install on Mavericks)