am 4f8c3741: more fixes for s.a.c

* commit '4f8c37412c4f803399f16f41e8b2c97d1db9f9b9':
  more fixes for s.a.c