Enhancements/warning fixes