Fix key errors