Fix behaviors