Couple of tiny changes