Add some chnage for pi 2.5