Fix these values clobbering others