Requirement fixes