Minor bug fixes from testing FAVIS