take over branch fix-warnings from LocutusOfBorg