Plenty fixes and tweaks
Remove support for object parameters again