misc changes to make landscape happier