some adjustment according cross-building feedback