Object type checkout fixes for namespaces