Beholder fixes