Fixed several issue includded sharing issue