Small tweaks for better crouton compatibility