Merge "Fixed multiple so issues"