Requirements bug fixes