Various cleaning ups