Requested tweaks.