Some random improvements