Further fixes to source mapping