Core: Fix Assertions after c7cd3b1248a86bfb92c9b197612f1711d9b6a054