Fixes required since enabling Faceshift is now the default.