Fixes for macro and protocol creator