More fixes build 100