Two more view helpers fixed