minor bug fixes from latest release