Fixed up multiple variables