Update to match all requirement of the compiler