Clean up a few warnings due to a vfunc signature change
develop
2019-09-30, Gary Kramlich