Native plugins cleanup and fixing (Part 1)