fixes for new function rules