Various clean up.