Fix issues with Mavericks.
Commit things that I forgot previously.