Small tweaks to support en more effeciently.