UIBehavior: Minor fixes