Fixed Fortify Bugs