Resolved requirements issues