Fixing little quirks after client move

Feature definition and fragment errors.