Source Analysis Fixes