[MUSIC][All ?] Mac and linux errors fixed