evan fixes