Fixes Fortify imports.
Fixes some small bugs related to changing Fortify's name
Merge commit '951956ee2bec8d15ef68cabf37b5063788d61d66' into HEAD