Small code tweaks.