Minor bug fixes.
Merge pull request #64 from Chase-san/bugfix0

Minor bug fixes.