fixed latest warnings