Catty Cathy: Miscellaneous fixes

Minor fixes