[Refactor] Clean up compiler warnings 4100 and 4189