more fixes for default_key to get testsuite running again