MIFOSX-1027 Fixing issues with maker checker