More binding tweaks