#CEXT-24 #CEXT-20 Fixes