Fixes to make crutch functionality work right in this module instead of hacking it together elsewhere.