Fixed warnings, obsoletes and code refactor