Changes for installation issues