Some more fixes. There are more to go...