[^]#master fixes in locations