Fixes

* more fixes