Small minor changes and adjustments