Fix remaining bugs related to source position information