tweaks to fix requires