Fix scene issues