Ensure that LWRPs are consistent

Hi @dgivens 

We've been successfully using these minor improvements made by @thommay for a few weeks now.

Makes sense to contribute these back.

Cheers,
Steve