Couple of changes

--