Moar warning fixes