Issue 92

Two reported issues, #95 and #96.

#96 remains open, but it's minor and I can't personally reproduce it.