Minor updaters to code