Minor fixes from 92d510f, fix #59