Play well with CanteenClient 1.2.0, new internal links