Fix for ACliC and Cling