Fix some mistakes on initialization
Minor modifications