Another minor bug fixes