Lots of fixes. Again.