Lets fix errors while building with newer toolchains