diff --git a/expire-tiles.cpp b/expire-tiles.cpp
index 38ec7c3ef..bc3e4d365 100644
--- a/expire-tiles.cpp
+++ b/expire-tiles.cpp
@@ -65,13 +65,12 @@ void destroy_tree(struct expire_tiles::tile * tree) {
  * Returns the number of subtiles which have all their children marked as dirty.
  */
 int _mark_tile(struct expire_tiles::tile ** tree, int x, int y, int zoom, int this_zoom) {
-	int	zoom_diff = zoom - this_zoom;
+	int	zoom_diff = zoom - this_zoom - 1;
 	int	rel_x;
 	int	rel_y;
 	int	complete;
 
 	if (! *tree) *tree = (struct expire_tiles::tile *)calloc(1, sizeof(**tree));
-	zoom_diff = (zoom - this_zoom) - 1;
 	rel_x = (x >> zoom_diff) & 1;
 	rel_y = (y >> zoom_diff) & 1;
 	if (! (*tree)->complete[rel_x][rel_y]) {
diff --git a/parse-o5m.cpp b/parse-o5m.cpp
index 7f93b6c33..efe3f90d0 100644
--- a/parse-o5m.cpp
+++ b/parse-o5m.cpp
@@ -747,9 +747,6 @@ void parse_o5m_t::stream_file(const std::string &filename, osmdata_t *osmdata) {
     otype= b&3;
 
     /* object initialization */
-    hisver= 0;
-    histime= 0;
-    hisuid= 0;
     hisuser= NULL;
 
     nds.clear();