Various fixes for the binding process