obj-common: more fixes