Fix some plumbings