[master] Fix some problems.