Mistakes fixes