Require fixes

Comments in commits.