Add some fixes due stabilize tests