Fix key problems