This MR does some minor cleanup of makefiles, and updates the versions of base and require to our most recent environment.