Would be awesome to see these fixes get pushed upstream! The Pump web client needs some serious love!