A couple more fixes to get the paths correct, but still broke