Yep these were taking care of in the other request. One of them will probably need a rebase based on which one lands first.