Rejig some more keys