Use 1 as default first index
Minor changes