wip: builder-enter and builder-leave fixes