Completed variable declaration fixes