Solution loading problem fixes

Solution loading problem fixes