More deprecated & warning fixes