Fixes per Austin review