Reduce warnings. See previous commit