A bunch of fixes all over.