Fixed all aompilation error