Some basic rules improvements