Better entry meta handling, small tweaks