Might as well fix these too