Latest round of fixes