Minor structural changes in patch