Fixes for db scene numbering fix