Pull in commits to fix warnings