-[FIX] Other fixes i don't remember