Fixed everything for release