Fix merge leftover bugs.