[US128.2] build tweaks