Gingerbread home threading fixes (again - cleaner)