#JC-1449 Fixed small bugs