Misc. adjustments and corrections.