[46249/46426] Fixed some issues