[@Nallore] Both issues should be fixed now~