Fixes to mark compatible with latest web trees