Various cleaning ups.