More left overs from conversion to new uid