Some fixes for view-change