Fixed scene issues