Minor scene fixes