[Fix] Fixed some new warnings
[Fix] CMake build cleanup and tweaks