More complex fixes