More compiler warning fixes