Clean makeobj
Fix check for objects