Escape artist fixes