Fixed more broken methods