Fixes to filename pathing hell, but not an amazing fix...