BG/CF - Fix Typo And Warnings
Fix Compile Errors
Update Previous Commit