Resolved mistakes