#19 Some post adjustments