Few follow on fixes