Fix spec require issues

Once and for all!