Lots of fixes...