Minor fixes and adjustments