Fix broken methods