some require fixes