No.8 bug fixes