[Pull Request] #88 Misc fixes.