bugfixes due to merge

This may be the case in production, but I was able to hit this code path locally