More behaviour enhancements.