Further fixes for Oxid 5.2