Keyconf and one last fix.