Minor bug fixes with objectid default value.