LPS-48160 Add more information where appropriate