More changes to avoid tests failing
Update features from live