Fixed MAC generation and hvm check.