Fix newly uncovered warnings