Hacks for more locs
Merge branch 'backend'