more finish startActivity fixes