common: fixes