Re: Function declaration fixes