fixup! compat changes for 0.11+