Fixes for Scene Debug