Fixes part of stories for dashboard and billing