merge done compiles

Need to test on loki