Merge issue corrections