WIP fixes for afterBinding