Fix some leftover PBI variables to work