Worked around the bug in all the scenes.  Now we need to collect actual location data.