Fixing bugs on the inherited code base