Fix require issues