Some post-compo tweaks and improvements.