Some coding fixes