two small-ish fixes

for #1 and #2 (tbd)