Couple of minor fixes..