Fix user stories