Some minor bugfixes in the new code. This should complete the supplier field integration.