first part global fixes