More reset fixes