Fixes for var and initializers

25 May 2013