Resolved some sonnar issues