Source analysis fixes