And more changes according to LibiadaCore.