Bye bug fixes