More fixes

* More fixes