Fix obf mapping, update CCL dependancy