Reduce warnings. Preparation for 10.2+0.93+1