Performed some of Platonides' suggestions

+ fixed a bug with creating new dumps

Change-Id: I05c2c5202b97848bbc5a7a8374713fe9280d4497