MOre fixes for key that had changed