Some fixes in behavior.