Some bugs fix