Fix warnings wrt unnecessary mut