diff --git a/emitter.c b/emitter.c
index 9a5b3fa..c4b56a2 100644
--- a/emitter.c
+++ b/emitter.c
@@ -1154,7 +1154,7 @@
             break;
 
         case YAML_MAPPING_START_EVENT:
-            if (!yaml_emitter_check_empty_sequence(emitter))
+            if (!yaml_emitter_check_empty_mapping(emitter))
                 return 0;
             length += emitter->anchor_data.anchor_length
                 + emitter->tag_data.handle_length
diff --git a/scanner.c b/scanner.c
index 86e2050..a2e8619 100644
--- a/scanner.c
+++ b/scanner.c
@@ -1122,7 +1122,7 @@
         simple_key.possible = 1;
         simple_key.required = required;
         simple_key.token_number = 
-            parser->tokens_parsed + parser->tokens.tail - parser->tokens.head;
+            parser->tokens_parsed + (parser->tokens.tail - parser->tokens.head);
         simple_key.mark = parser->mark;
 
         if (!yaml_parser_remove_simple_key(parser)) return 0;