@SLaks, can we fix these now? before the release..