Fix object orientations again, add workaround for flipped objects