Fix my mistakes in prev. commits.