Adding misc updates