Various minor adjustments