Boss bug fix pass