multilayer bug fixes (tmp)