A whole host of fixes