Source Analysis fixes