type declaration fixes