Tiny fixes for base-4.7 compatibility

[lukexi]

Thank you! I'll put in some ifdefs to squash the warnings on 7.10 later...