aco: fix build errors

Here's a couple of commits that fixes a bunch of compile-errors on ACO for me.

Maybe I'm doing something wrong? Please advice :)