Fix for Project Reference issues