Fixing up hashes for 1.8 syntax (yes we need this for now)