NXP-14069: Clean up the addon and fix several issues