Couple of fixes around failing tests