Couple minor fixes