Fixing some hardcoded paths