[#20][#21] Fixes related to compatibility improvements with Articles extra