Fix code broken by warnings fix