[General] build impovements