Post user-testing fixes