fixes for master keys