Core: fixed typos from previous commit and kill more warnings