Offices fixes