Bug fixes based on initial ad-hoc testing