Rule Generator Fixes