Fix some outdated stuff