Minor fixes on #18