Fixed bugs with beacon updates, among other things.