Less warnings