Anafores bug fixes