Some more fixes. :-)