Various fixes to allow us to again build if --enable-mapped-location: