Minor fixes/adjustments