Fixes to 'main' due to strange merge

Still problems with Object class.