Primary action fixes