More require fixes, sigh