diff --git a/src/app/cmd/replace_image.h b/src/app/cmd/replace_image.h
index ed66509e2..88f400d90 100644
--- a/src/app/cmd/replace_image.h
+++ b/src/app/cmd/replace_image.h
@@ -46,13 +46,13 @@ namespace cmd {
     }
 
   private:
+    ObjectId m_oldImageId;
+    ObjectId m_newImageId;
+
     // Reference used only to keep the copy of the new image from the
     // ReplaceImage() ctor until the ReplaceImage::onExecute() call.
     // Then the reference is not used anymore.
     ImageRef m_newImage;
-
-    ObjectId m_oldImageId;
-    ObjectId m_newImageId;
     ImageRef m_copy;
   };
 
diff --git a/src/app/commands/cmd_preview.cpp b/src/app/commands/cmd_preview.cpp
index cba217571..0bfda7931 100644
--- a/src/app/commands/cmd_preview.cpp
+++ b/src/app/commands/cmd_preview.cpp
@@ -61,10 +61,10 @@ public:
     , m_doc(editor->document())
     , m_sprite(editor->sprite())
     , m_pal(m_sprite->palette(editor->frame()))
+    , m_zoom(editor->zoom())
     , m_index_bg_color(-1)
     , m_doublebuf(Image::create(IMAGE_RGB, ui::display_w(), ui::display_h()))
-    , m_doublesur(she::instance()->createRgbaSurface(ui::display_w(), ui::display_h()))
-    , m_zoom(editor->zoom()) {
+    , m_doublesur(she::instance()->createRgbaSurface(ui::display_w(), ui::display_h())) {
     // Do not use DocumentWriter (do not lock the document) because we
     // will call other sub-commands (e.g. previous frame, next frame,
     // etc.).