Small adjustments and corrections