Couple of fixes