Fix reset and disable functions