Some random improvements.