const fixes, declaration fixes