Pulled in variable changes from Vaprobash