final path fixes I swear