Fixes to finding function calls