asfbah: global fixes

* global fixes.

Signed by: PXke
prod fall back
Merge pull request #16 from PXke/dev

Dev