Move to some newly added upstream functions
Clean up warnings