Two small-ish PRs addressing some limitation I hit...
# development