Update to Plumber v0.4 (with patches)