Fixed some bugs introduced during last refactoring. Also made multiple backup work stable