Some fixes for Ayato format