Fixed objectid issues