Various bug bash fixes