Fix for ART build + add default