Fixed loading sequence
Minor fixes