PR fixes (to be squashed)