Core: meh, fix build and warnings