Schema attributes fixes.