small number of bug fixes