Some fixes to maintain the beacon major and minor