Just a couple of minor fixes
Couple more fixes