Fixes to compile against 2.7.81