A whole set of fixes