Fixing some rules