Fixed survey warnings