Cumalative build fixes

**DON"T PULL**