More fixes to location and nil trace