A number of fixes aimed at making things faster.