Minor fixes.
Fix NoUnlimitedErrors stuff