more flattened fixes