FULLPIPE: Further work on scene18and19 renames
FULLPIPE: Fix compiler warning