Resolved more XXX's