* flattener fixes