Fix expressions