Fix obvious fails