Multiple views fixes