Non-core: few minor updates to the extras