Final fixes/cosmetic before push to host