Fixed pump crash and power issues