Resolved some assignments