couple minor bug fixes for previous commit