Fixed base directory path finding issues