Some minor fixes on #67