More base path fiddling