fix up the last usages of activity and lbw.id I can find