Couple of small changes