bug fixes - minor