Cleanup issues from #99 and #100