Alpha Response: Hotfix for recent patch

fix some critical bugs we missed