Some more things were fixed... I don't even remember what