few fixes and native sources updated to 1.6.4