Proposed changes to allow compilation under Mavericks (for review by Sean)