Fixes for integration test + resignation of types propagator (too much magic)