Fixes per support email