Updates for anddown compilation, but there is a crash