Fixes on #63