LPS-35668 fix several bugs from alloy migration (reviewed by Nate)