More bug fix attempts