Some fixed to make Intel work better and still optimize