Couple of minor fixes before starting on grunt