minor bug fixes II