Fixed up remaining variable definitions