Landover: 18 June fix

Stability and performance improvements