- Fix some bugs introduced by recent commits.