Yet another update to commmon code

Signed-off-by: chthonic7 <fooliot@gmail.com>