Custom cdART: Last fixes