Fix small issues and close #2