Fixed some issues with LWP changing