require() fixes, associated changes