Fixes compilation on i686 and aarch64. I can't test them though as drivers isn't compiling properly anymore.