InvBeacon fixes