Final ZAS BS12 fixes, not touching it anymore :)