Oh I see, I totally missed these two. I just fixed it, if it's alright with you I'll squash the last two commits into the first one. Or I could squash everything into one commit.