more tiny fixes to work around #54