Require fixes