Fix contributed behaviors