Miscellaneous changes for Blackberry.