Fix duplicate data in the pump list
Fix some Null pointer exceptions when resetting the timers