Little changes/fix