Zaraq: build 1.0.9

Small fixes for build 1.0.9