Small fixups

This fixes issues #3 and #4