Fix warnings in the build

parent #381 
What replaced this?