Variable declaration fixes