fix warnings (sync from HEAD)