VariableDeclaration and Fixes