Some minor var changes