Core: Yet more warning fixes