Fixed some super legacy stuff