Feature merge fixes