Another some fixes
Prepare for WALL·E movie review :rocket: