Update specs based on #206 comments