Jarv/fix static root