Fixed Aina bugs.