Small variable declaration fixes