1294 warnings refactor

 Refactored type deprecation warnings to remove false positives.