some fixes for xperience™17