More changes to code for no latches