Fixing several conduite bugs