Fix auto binding issues