Fixes for conditionals in conjuction with LISTS