Fixed everything from last errors