fix compilation error / failing tests