more tweaks for new boostratp setup