user build flow fixes