Minor fixes
Fix #47