diff --git a/include/evm.h b/include/evm.h
index 3f99bd4..71e4142 100644
--- a/include/evm.h
+++ b/include/evm.h
@@ -159,11 +159,11 @@ union evm_variant {
 /// ::EVM_COINBASE        |                      | evm_variant::address
 /// ::EVM_DIFFICULTY      |                      | evm_variant::uint256be
 /// ::EVM_GAS_LIMIT       |                      | evm_variant::uint256be
-/// ::EVM_NUMBER          |                      | evm_variant::int64?
-/// ::EVM_TIMESTAMP       |                      | evm_variant::int64?
+/// ::EVM_NUMBER          |                      | evm_variant::int64
+/// ::EVM_TIMESTAMP       |                      | evm_variant::int64
 /// ::EVM_CODE_BY_ADDRESS | evm_variant::address | evm_variant::data
 /// ::EVM_BALANCE         | evm_variant::address | evm_variant::uint256be
-/// ::EVM_BLOCKHASH       | evm_variant::int64   | evm_variant::uint256be
+/// ::EVM_BLOCKHASH       | evm_variant::int64   | evm_variant::hash256be
 /// ::EVM_SLOAD           | evm_variant::uint256be | evm_variant::uint256be
 typedef union evm_variant (*evm_query_fn)(struct evm_env* env,
                                           enum evm_query_key key,