Fix requirements issues