Few fixes initvars