Fixes for reset

Signed-off-by: Liz <grubbycodemonkey@gmail.com>