Small adjustments and fixes