Minor fixes
Editing objects type is now thread-safe (but not possible to do after object was initialized)