Some minor fixes and adjustments