Fix some Source Analysis Issues