[Bug 8890] Bug fix patches unbreaking the build on x32 systems