Fix build issues against current.