Core/AHBot: Update to latest suggestions