Fixes to the FirmaService