#JC-1379 Fixed small bugs