Little fixes on #6