Minor fixes, including #37.