bug bash fixes