Some post rendering fixes