Fixing more post-merge layer issues. A few bits of foliage needed reimporting to update correctly, which then necessitated S2P on monuments that used them.