Fixes for relative numbering automation