Fixed few variable redeclarations