bind: Various fixes
This is based on !2503 (closed) . So that one should be merged first and this patch series only contains 3 commits.
This is based on !2503 (closed) . So that one should be merged first and this patch series only contains 3 commits.