Some small fixes and adjustments