Fix some problems with branches. Because of parallel programmins of two branches, I have several problems with commit some changes.