to make rake pass

Changes made to make rake pass under x86_64-darwin13.