Misc tweaks to new rest rel link stuff, plus bypass opt