diff --git a/src/include/maskfld.h b/src/include/maskfld.h
index dd45dc581..69c548285 100755
--- a/src/include/maskfld.h
+++ b/src/include/maskfld.h
@@ -1357,6 +1357,7 @@ class TGolem_field : public TEditable_field
 	WINDOW _toolbar;
 
 protected:  // TEditable_field
+	WINDOW parent() const { return _tool ? _toolbar : TMask_field::parent(); }
 	bool is_kind_of(word cid) const {	return cid == CLASS_GOLEM; }
   virtual TString& get_window_data();
   virtual void set_window_data(const char* data);
diff --git a/src/include/tabapp.h b/src/include/tabapp.h
index cf82604fc..860fcfe2b 100755
--- a/src/include/tabapp.h
+++ b/src/include/tabapp.h
@@ -34,7 +34,7 @@ protected:
   // @cmember Richiede se il record corrente e' protetto (non cancellabile)
   virtual bool protected_record(TRectype& rec);
   // @cmember Richiede la maschera da usare
-  virtual TMask* _get_mask(int mode = MODE_QUERY);
+  virtual TMask* _get_mask(int mode);
   // @cmember Indica se la futura <mf Tab_application::get_mask> ritornera' una maschera diversa
   //        dalla corrente.
   virtual bool changing_mask(int mode);