Fix vfc-catalog code and API inconsistencies