Some binding tweaks.