fix issues & proper native resolving