Fix bean definitions for interceptors