Fixes of issues found by Analyzer
Updated approach of extracting base sdk version from full version.