Version 2.2: Miscellaneous bug fixes