fixes for autokey