@njsmith Pushed fixes.