Small changes to keyx