Drop warnings

same as the previous pull but with the suggested fixes.