PROBCORE-541 Fixed some bugs.