SunakazeKun more fixes