Some fixes for the keys