Fixed issues

U4-1709, U4-2612, U4-1477, U4-1071, U4-895, U4-1083, U4-670