Various Rules Branch cleanups and fixes