fixed post main build issues.