Moving forward by fixing bugs