Fix a dependency issue with fza/CheckStack and other minor changes