More fixing bugs