Announcer fixes, simualted location fixes