Some fixes to repository in order to get tracks