Minor scene mode cleanup