couple of fixes and container/acc services