Faceplus fixes.