Minor interaction improvements