More changes from fuel cms