Move TBS stuff out of configure