Fixing all them fails