More require fixes