fix compilation problems, improve signature decoupling