Fixes to rules enforcement, pointrange computing