declaration fixes