More internal binder fixes