Follow up changes to pass CI.