KOLO-2 complete, fixed some AutoMapper related errors