Fixing missing command keys