Update tracked repositories

Some commits are merged in official repos now