Fixed bugs related to changing project