More fixes to make build work