Binding tweaks