Small fixes and adjustments