Fixed some outdated stuff