Some visibility tweaks.