First batch of compiler warning fixes
More compiler warning fixes