Maybe all these can be part of a different PR.