Fixes for scene conversion and regexs