CFY-516 monir fixes