A few changes that allow beacons to work on 10.9.x

This is a dirty commit to capture the zbeacon file in the current
(working) form. A cleaner solution can be sought from here.