Some fixes on survey model class