Fix speed and build issues.