Fix non-declared vars issues