Yes, I think I missed some of them. Will change in next commit.