Fixes related to compatibility improvements with Articles extra