More fixes

more is coming, but feel free to review + merge :)