Fixing output schema issues