fix blacklist and 2-D machines