Well, forgot about these two changes...