Rebuild after making some corrections