Couple of misc changes