Various tweaks for extensibility