Sounds good. Let's open another PR for those two then.