variable declaration fixes