Minor Fixes

Here are just the fixes from #164.