Try and reduce differences to master