Couple of fixes.