Fixed everything so it passes the compilation now