Couple of minor fixes.
Hopefully avoiding the JABBA award.