minor schema adjustments