minor bug fixes ...