Fixes on firmware plugins