Migrated codebase to engine beta release 172, fixing minor shadowing issues