Fixed compile errors, some more code on ACO