Multiple bug fixes for view change & recovery