Couple of changes and tweaks