Some more fixes

Some more left-over fixes. On-going.