sort out some require issues