Two more consistency fixes