Var doc & source fix