Start fixing bugs