Pilatus2m related changes