More build warning fixes