Collapse format fixes