Some small fixes and some plugin_call_field things temporarily for tests