Some minor changes to make sure SearchableBehavior complies with E_STRICT