Develop - more warning fixes