Try to fix key errors