Lots o' fixes