misc randomcat fixes