Fixes for key