WIP on amven build fixing