fixes for key