Rem of a couple of quick PRs