Fixes for merged feature.