Minor fixes, see #44