more rank fixes